Merge r-mpr-2022-01-05

Change-Id: I8f57ecb3746315779dc573e022ff1c5a35988420