Merge r-mpr-2022-01-05

Change-Id: I28c4ae7e02fb6dec2275c1eb6a959b59b41e20be