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