Partially merged ReportProcessor changes (master and dev)