adding support for final report: #MSG-290 In Progress