Extracted searching of base method references
Merge branch 'master' into mixinnet
Implemented code fix for base references