manually fix merge, pipeline failures can be ignored until v2 is merged in