merged Mesh2Cloud back from custom branch