Merge branch 'bug_9219' into 3.14-master