Merge branch 'bug_9984' into 3.14-master