Merge r-mpr-2022-01-05

Change-Id: Ib993017e419ecf90b163ebcce92c47f026a34e20