Merge "Fix sticky rescue party boot" into main