Merge r-mpr-2022-01-05

Change-Id: I114f4fb7043c352241abab3624ed4b1d4da0cb3e