fix class cast
fix class cast
Merge branch 'master' into local_changes