Merge branch 'bug_10022' into 3.14-master