Merge s-mpr-2021-12-05

Change-Id: Ib3105dff17483e73ea044e7c4f7aca0ce5dad39d