Merge branch 'bug_10103' into 3.14-master