Port MR1527 from float

Basic Info

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