Merge "Add resource config for the GeoTz feature"