Merge patches from @andreiled - support mesh generation by geo script