Bug 895507 [merge]