Merge branch 'bug_10042' into 3.14-master