Merge branch 'log_retry'