Merge "Changes associated with the new geotz module"