Merge branch 'main' into 1460-code-cleanup-ivas_mc_param_enc_fx-c-inconsistent-naming-of-variables