Merge branch 'bug_10196' into 3.14-master