Merge r-mpr-2022-01-05

Change-Id: Ic4bd0db67d5aa341fb581e0479b6bf4e959936fb