Merge branch 'bug_9402' into 3.12-master