Merge branch 'jc/am-report-3way'