Merge "Fix backwards check in CheckStaticMethod" into klp-dev