Merge branch 'bug_8816' into 3.12-master