Merge branch 'bug_9107' into 3.12-master