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

Fixes