Merge branch 'geoapi-3.1'