Merge s-mpr-2022-01-05

Change-Id: I2dc2f127671c4db306de2e035c4ae329bdae8aa2