Merge branch 'main' into 1443-minimal-code-cleanup-in-ivas_smc_gmm_fx