Merge branch 'bug26712'