Merge branch 'bug_9034' into 3.12-master