Merge r-mpr-2022-01-05

Change-Id: Ib4fb231659e65dac4929f10c2045c5da0b80bc43