Merge "Fix the retry logic" into 24D1-dev