Follow Me issue on latest version - Multi Tenant