Merge r-mpr-2022-01-05

Change-Id: I74fddf8814b3bc7007cf023aa801cc423691d5f1