TW: Allow MapperOptions for TenantMapper. Updated snapshot version.