Merge commit 'smcv/force-uuids' into force-uuids