Merge branch 'bug_9883' into 3.12-master