Merge mpr-2021-11-05

Change-Id: I06db320272ebd1151fa0a4c4d1927dad54023053