Merge branch '2091-fix-infinite-loop-in-ivas_core_enc_fx' into 'main'

Resolve: "Infinite loop in ivas_core_enc_fx from FIX_2021"

Closes #2091

See merge request !2359