Merge "Switch to decorators.idempotent_id"