CORE-5386 Added remaining UUID conversions.