Merge "Fixes idempotency and maintence with logging"