Merge pull request #1654 from nabinhait/v4-hotfix

fixes and patches