Merge pull request #3195 from nabinhait/v4.x.x

fixes