Merge branch 'main' into ci/add-logging-for-encoder