Bug 923369 [merge]