Merge t-mpr-2022-11

Change-Id: Iac13a0dd05a0d51349205d8951c2a83cafa4ba67