Merge branch 'geoapi-4.0' into geoapi-3.1