The last commit pruned something that should have been integrated into a different patch. This commit fixes that. Also, clean up the intermediate changelog entries, because they look kind of redundant. Related: #1985099
Related: #1985099
Update to 40.1 Related: #1985099