Port MR1587 from float

Basic Info

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