Merge "Update enrollment with API update" into rvc-dev