Bug 956050 [merge]