Merge branch 'bug_9764' into 3.12-master