Merge r-mpr-2022-01-05

Change-Id: Iec11ca669ac646097febca01df83fe464714c967