Bug 956651 [merge]