Merge "Tidy configuration associated with geotz" into sc-dev