Merge mpr-2021-11-05

Change-Id: Iaef6f4efaa9f89d87eba1da0956489fc0d6545b6