Merge branch 'bug_7253' into 3.12-master