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