Merge branch 'bug_9671' into 3.14-master