Merge mpr-2021-11-05

Change-Id: I27810dc3fece81abe382414513a190d28855b52d