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