Merge branch 'bug_8931' into 3.12-master