[ci skip] Add changelog entries for PR #2303