Merge s-mpr-2021-12-05

Change-Id: Icac4ef244968540bd6b7c36b8bf736e0bf038414