Merge mpr-2021-09-05

Change-Id: Ide1dad3ae1db3fae13c692c2c5db429ea232bae6