Merge s-mpr-2022-01-05

Change-Id: Ifd81dc56b0e76c0d7839cd12583426287aae1812