Port MR 1498 from float

Basic Info

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