Reduced dependencies to IGenericCharacter
Merge remote-tracking branch 'origin/master'