Merge branch 'bug_9863' into 3.12-master