Port MR1688 and MR1729 from float

Basic Info

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