Should this tenant alias be optional so we can fall back to the current tenant if it is not provided? /cc @mrvisser @simong