Merge "Add list the primary tenant"