Merged from bug 597a7386-643f-4559-8dc4-6871924229b6