added index lookup for subclasses
Merge remote-tracking branch 'upstream/master'
Merged kmusses fix on polymorphic index usage