Merge r-mpr-2022-01-05

Change-Id: I537391f8c70856505e8c465aa6e09462de2b74bc