Merge "Update resource UUids for resource status"