Merge branch 'bug_10040' into 3.14-master