Merge branch 'bug_10053' into 3.14-master