Merge branch 'bug_7368' into 3.12-master