Merged from bug 4a4609c8-1882-47de-9d30-fee410b8a802