Merge branch 'geo_development'