Merge branch 'bug_9052' into 3.12-master