Fix #8250, relationship links not pointing to correct target
Merge branch 'dev' into test
Merge branch 'test' into prod