Merge branch 'bug_10044' into 3.14-master