Upstream changelog has been added and short description now passes xlint. Closes: #33265 [via git-merge-pr]