Merge pull request #1812 from nabinhait/v4-hotfix

Multiple fixes