Port MR 1298 from float

Basic Info

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