Merge "Handle static methods in Plugins better." into main