Merge branch 'bug_9418' into 3.12-master