Merge r-mpr-2022-02-05

Change-Id: I1107ca02a6133da4b12edceeb1bbe2ec631d1e23