Merge branch 'bug_7687' into 3.12-master