Port mr2156 from float

Basic Info

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