Merge branch 'main' into 1980_fix_crasg_fdcng_encode-sid