Update to remove-cud-and-conneg branch to test