Merge branch 'bug_8546' into 3.12-master