Merge "Adjust geotz feature config logic" into sc-dev