Merge pull request #4530 from VishnuSanal/release/4.0