Port MR1513 from float

Basic Info

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