Merge branch 'bug_9804' into 3.14-master