Merge s-mpr-2022-01-05

Change-Id: I051d0dffd9df2f4b0a05bca2cc0adfc49ff04d9f