Amended #23617 -- Refactor the code that validates the UUID4 identifiers