Bug 952051 [merge]