Merge branch 'bug_9684' into 3.14-master