Merge branch 'bug_8733' into 3.12-master