Merge branch 'bug_9546' into 3.12-master