Merge remote-tracking branch 'remotes/origin/main' into 2430-simplify-ivas_core_enc_fx