Merge branch 'bug_8378' into 3.12-master