Merge "Add new atoms for auto revoke" into rvc-dev