Refs #16718 - Preserve manually added relations whin auto-relations

- Preserve manually added relations when auto-relations feature is
  enabled