Merge r-mpr-2022-01-05

Change-Id: Ic2a6df2b1072ff59e76acee279ca1175dbe32d9e