Merge r-mpr-2022-01-05

Change-Id: Iaedfde3226777479c0ad226cb61cf2a99c5d503a