Merge branch 'release-v2.1.16' into develop
Various reporting fixes

- Fix @reports looping
- Send one request to create multiple reports
Version 2.1.17
Merge branch 'release-v2.1.17'