[non-BE] Port MR1548 from float

Basic Info

• Original merge request in float repo: ivas-codec-pc/ivas-codec!1548 (merged) (merged)

Port also MR 1672 at ivas-codec-pc/ivas-codec!1672 (merged) (merged)