Merge branch 'bug_9986' into 3.14-master