Merge s-mpr-2021-12-05

Change-Id: Idc465dc667c39179ce6c47c7026a24e28a9197af