UUID Fixes, 1.0 branch (2020.09.23.)
This is a cherry-pick of !733 (merged) into the 1.0
branch. Making sure that the issue described in ATLINFR-3736 would not show up in the 21.2
branch either.
This is a cherry-pick of !733 (merged) into the 1.0
branch. Making sure that the issue described in ATLINFR-3736 would not show up in the 21.2
branch either.