Merge r-mpr-2022-01-05

Change-Id: I9362449410acebd92a52771ed0fd7aecc78424ce