Bug 906840 [merge]