Merge branch 'bug_10083' into 3.14-master