Merge pull request #1596 from nabinhait/v4-hotfix

V4 fixes and updates