Merge mpr-2021-11-05

Change-Id: I72e4aea1e4067b49ce3678e5d1c985e45953864f