Merge s-mpr-2022-01-05

Change-Id: I40e1d27cddc779f2b54320af9ce1f438387b38f9