Merge branch 'bug_8443' into 3.12-master