Merge s-mpr-2022-01-05

Change-Id: I7d1dbe166be2f88735505083617f5605860e3c93