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