Merged from bug 4f7a4c3b-31e3-4023-8c9d-e67f627a34f0