Merge mpr-2021-11-05

Change-Id: I2d8a2abdda74b2562c06b3d0c4b7ed8433a1239a