GPX GEOWAVE-89 with latest master
GEOWAVE-89-M; reformat and shrink ids