Merge branch '2260-wrong-report-link' into 'develop'

Resolve "Wrong user link in Report email"

Closes #2260

See merge request !3121
15 jobs for develop in 81 minutes and 53 seconds (queued for 6 seconds)