Merge r-mpr-2022-01-05

Change-Id: Ieebb4b53f1daa7b63d3308657304177424bbdc3c