Merge branch 'bug_7449' into 3.12-master