Merge "Fix Loader bugs" into nyc-support-25.2-dev