Merged without CHANGES: 9.12.0, 9.11.3, 9.10.7, 9.9.12