Merge branch 'bug_9803' into 3.12-master