Merge pull request #13119 from sbagdat/patch-1

Update render with a spacer_template [ci skip]
Improve changelogs [ci skip]