Merge pull request #1779 from nabinhait/v4-hotfix

Fixes