more report stuff
Merge branch 'development' into qa