Merge r-mpr-2022-01-05

Change-Id: I505422f3fc5e12fcc74d8b37db8317b2f3777d68