Merge s-mpr-2021-12-05

Change-Id: I92816be11d282af58c33a6b532f4c935be728cac