Merge mpr-2021-09-05

Change-Id: Ib08b575eda1af70a5db60592b29801390e7f0b6e