BS-10568, getTenant should not be static