Merge branch 'bug_9880' into 3.12-master