Merge branch 'bug_10049' into 3.14-master