Merge pull request #1740 from nabinhait/v4-hotfix

fixes