Merge mpr-2021-11-05

Change-Id: I80c63bfc225062fe1610d73b5e5a1bc4b1a55a31