Merge branch 'bug_9737' into 3.14-master