Merge branch 'bug_7938' into 3.12-master