Merge upstream CADmesh