Merge branch 'bug_9683' into 3.12-master