Merge r-mpr-2022-01-05

Change-Id: I0cc52c3f4cf89104a48b511c49a4fd239049bef5