Merge mpr-2021-11-05

Change-Id: I2b15af507fcd6528d9caeb083dc600a0b59ba255