Merge branch 'bug_9403' into 3.12-master