Merge r-mpr-2022-01-05

Change-Id: Ib7e52cd30ef495d87b97a08a302ff44c0bfdf46c