Bug 912819 [merge]