deprecate 'current_tenant' in favour of 'current'