Merge r-mpr-2022-01-05

Change-Id: I7d65ad1de2dd2cc0b9a346afbddc22b775729c1d