BLD-147 auto-retry support