Merge branch 'bug_10097' into 3.14-master