Merge branch 'bug_7455' into 3.12-master