Merge branch 'auto-retry-init'