Some reporting specs
Merge branch 'develop'