Merge branch 'feature/report_origin_fixes' into integration