Merge branch 'bug_7740' into 3.12-master