Port MR 2051 and MR 2152 from float
Basic Info
Original merge request in float repo:
ivas-codec-pc/ivas-codec!2152 (merged)
and
ivas-codec-pc/ivas-codec!2051 (merged)