Merge branch 'main' into ci/complexity-measurements-split-by-enc-and-dec