Cherry-pick "Merge branch 'UUIDFixes-1.0-20200923' into '1.0'" into master
UUID Fixes, 1.0 branch (2020.09.23.)
See merge request !734 (merged)
(cherry picked from commit 16c8980a)
UUID Fixes, 1.0 branch (2020.09.23.)
See merge request !734 (merged)
(cherry picked from commit 16c8980a)