Merge branch 'release/1.0'
fix report
Merge branch 'hotfix/fix_report' into develop