Merge branch 'main' into 850-ci-add-history-graph-to-report-page