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