Merge "Finish switching to decorators.idempotent_id"