work-around for reporting
Merge branch 'controller' into dev