Merge "Lower fallback deadline." into main