Merge branch 'bug_10145' into 3.14-master