Port MR1487 from float
Basic Info
Original merge request in float repo:
ivas-codec-pc/ivas-codec!1487 (merged)