fixes #8555 - uuid issues during create or associate