Bug 974479 [merge]