Merge branch 'bug_9620' into 3.12-master