Bug 913217 895507 [merge]