Patch Pilot Hand-off 25.04