Merge "Improve static method / field handling" into mnc-dev