Merge "Fix retry logic" into main