Merge r-mpr-2022-01-05

Change-Id: I6c16cfb37efacf4571444dc9178b3a79005a659d