Merge branch 'bug_9239' into 3.12-master