Merge "Always pass down the caller class to nativeLoad when it's known." into main