Merge r-mpr-2022-01-05

Change-Id: I582dddd85061ddcc06d61b5d9b4ed2e3d0e99a5b