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