Merge mpr-2021-11-05

Change-Id: I1a2dde86c80d03956514b34661d9f8c044d5527a