Merge branch 'bug_9102' into 3.12-master