Fixed report variable names
Merge branch 'dev'