Bug 956572 [merge]