Merge branch 'main' into arithmetic_huffman_coder_changes