common tenant update to consider end of authority

code review update