Merge s-mpr-2021-12-05

Change-Id: Ie46b333fc559b314fc1eb5e58fc24ea5022ad164