Merge "switching to decorators.idempotent_id"