Code

Merge branch 'jc/maint-apply-report-offset' into maint