Port MR 1437 from float

Basic Info

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