Merge branch 'bug_10100' into 3.14-master