Merge branch 'bug_9997' into 3.14-master