Merge branch 'bug_8519' into 3.12-master