Merge branch 'bug_7853' into 3.12-master