Merge branch 'main' into fix_todos_in_fd_cng_enc