Merge branch 'main' into ci/encoder-test