Merge branch 'features/reports-enhancements' into 'develop'