Merge branch 'bug_7358' into 3.12-master