Merge pull request #1845 from nabinhait/v4-hotfix

V4 hotfix