Merge r-mpr-2022-01-05

Change-Id: Ia79a6a73dd019ccc76bd385937c2d347607f6c57