Merge "[BUG] Retry interval for kafka consumer"