Merge branch 'bug_9766' into 3.14-master