Merge pull request #1826 from nabinhait/v4-hotfix

V4 hotfix