Merge branch 'bug_9534' into 3.12-master