Merge branch 'bug_6428' into 3.12-master