Update code comment to keep it up to date

[#2691]
[ci skip]
Add entry to changelog

[#2691]
[ci skip]