Merge branch 'bug-425080'