Merge pull request #1856 from nabinhait/v4-hotfix

V4 hotfix