Merged without a CHANGES note to 9.12.0, 9.11.3, 9.10.7, and 9.9.12.