Merge MR1832 and MR1856 from float

Basic Info

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