UPDATE FLEX-33829 improve create UID performance and use
fix minor issue