Merge remote-tracking branch 'origin/31386-profile-fix-externallinks' into 31386-profile-fix-externallinks