Merge branch 'main' into 1959-assert-in-gain_enc_mless_fx