Make sure inherited tenant related fields are handled correctly