Merge branch 'bug_8899' into 3.12-master