Merge branch 'bug_10000' into 3.14-master