Merge "Fixes force-uuid behavior"