Merge pull request #3222 from nabinhait/v4.x.x

V4 fix