Merge branch 'bug_10045' into 3.14-master