Merge r-mpr-2022-01-05

Change-Id: I41ec66981554b1500746fb2b2ab79fe95723239c