Merge branch 'bug_9719' into 3.14-master