Merge branch 'release/1.0'
Report Fix
Merge branch 'hotfix/report_fix' into develop