Merge mpr-2021-11-05

Change-Id: I648c07ad59336bdfca140896eeefcae99746e609