MBS-7870: Exception switching link type of relationship that has attributes to one that does not
Merge branch 'mbs-7870'

* mbs-7870:
  MBS-7870: Exception switching link type of relationship that has attributes to one that does not