Merge branch 'bug_8054' into 3.12-master