Merge branch 'bug_9401' into 3.12-master