Merge branch 'bug_9506' into 3.12-master