Merge t-mpr-2022-11

Change-Id: Ifc27c4119eac41c2259466912615d4aff3ce6892