Merged without a CHANGES note.

9.9.12, 9.10.7, 9.11.3, 9.12.0