#5160 Use new merge methods with uuids as parameters