Merge branch 'bug_9886' into 3.14-master