Merge branch 'main' into ci/fix-enc-passthrough-test