Merge branch 'bug_9498' into 3.12-master