Merge branch 'bug_9933' into 3.14-master