Merge "add enrollment application UID tracking" into rvc-dev