Merge branch 'bug_7440' into 3.12-master