Merge branch 'bug_9201' into 3.12-master