Bug 958892 [merge]