Merge s-mpr-2022-01-05

Change-Id: Ie72ea12038b784a696a39b4a9c399f6beb24060b