GPX GEOWAVE-89 with latest master