Merge r-mpr-2022-01-05

Change-Id: I327093b2d8c1d04c65403c245ef1012ca014103a