Merge mpr-2021-11-05

Change-Id: I60afa0e69553937d5d03d373bf01fdd74a87ee3a