Merge pull request #4356 from abdulroufsidhu/release/4.0