Merge branch 'bug_8853' into 3.12-master