Merge r-mpr-2022-01-05

Change-Id: Ia43fe288c4cdee234082c42301737291a51ccb0d