Merge branch 'bug_9483' into 3.12-master