Merge pull request #4606 from Bambooin/release/4.0