Merge branch 'bug_7189' into 3.12-master