Merge branch 'bug_8117' into 3.12-master