Port MR2037 from float

Basic Info

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