Merge t-mpr-2023-01

Change-Id: I4821e8aa1f54d311eda0878f193e1a7202976381