More idempotent refactor and fix for action #2460