Merged from bug c894f10f-197d-4b22-9c5b-19f394df40d4