Backport #24150 to 9.10
This backports !12152 (closed) to 9.10.
It all applied cleanly. Only the changelog entry had to be moved.
Edited by Teo Camarasu
This backports !12152 (closed) to 9.10.
It all applied cleanly. Only the changelog entry had to be moved.