Merge branch 'bug_9428' into 3.12-master