#5187 Use new move methods with uuids as args