Merge "Blast sync timeout should be in s, not ms" into main