Class info player issue changes merged from 6.6.a3 branch