Merge branch 'feature/report-notes' into 'develop'