Merged without a CHANGES note.

9.11.3, 9.12.0