Merge branch 'bug_7608' into 3.12-master