Supersedes !362 (closed)
Add a couple more ChangeLog entries, and fix #40380 (closed)
Closes #40380 (closed)