Merge "Fixed the missing capabilities in the retry config" into main