Merged without a CHANGES note to 9.11.3, 9.10.7, 9.9.12 (it wasn't failing
in master).