Merge s-mpr-2022-01-05

Change-Id: I3c2166dd5e954f0e78d68113dac34d909f1fde72