Merge branch 'main' into ci/fix-long-term-logs