Merge branch 'bug_9850' into 3.14-master