Merge branch 'bug_9020' into 3.12-master