Merge mpr-2021-11-05

Change-Id: I897f40c39463dbc5c00cd4a8ef470043e5db3e06