FLEX-33829 correct UID format