Merge mpr-2021-11-05

Change-Id: Ib4ca0c39ac8e57e9122328c304fc29e9adafcf29