Merge "Fix stale data due to stopped loader." into nyc-support-25.2-dev