Port MR1775 and MR1423 from float

Basic Info

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