Merge s-mpr-2021-12-05

Change-Id: I80aacb604125b0e820e0c3d100d65fa81a731bca