Merge mpr-2021-11-05

Change-Id: I9101f546b2cd53223c8c90de754e6bde40a90fa9