[ci skip] Polish changes and add a changelog entry for PR #4855
3 files changed