Merge branch 'bug_9438' into 3.12-master