Merge branch 'bug_9030' into 3.12-master