Applied without CHANGES note as separate commits cherry-picked into
master and all maintenance branches.

9.9.12, 9.10.7, 9.11.3, 9.12.0