gdal: sync with main tap