Merge branch 'main' into ci/merge-logs-script