Merge branch 'bug_10152' into 3.14-master