Merged lastest version of reporting module