Merge branch 'bug_9680' into 3.14-master