Merge mpr-2021-11-05

Change-Id: I008ea1863828dcc0728f8809554bc9a6a2d392b2