Merge branch 'bug_9933' into 3.12-master