Update Changelog

[ci skip]
Merge branch '4-0-stable'