4179 - Standardise links
Merge remote-tracking branch 'origin/4179-Invitation-to-claim' into 4179-Invitation-to-claim