Consistent resolution of Class methods and static methods

Issue: SPR-12502