Merge s-mpr-2021-12-05

Change-Id: I5b02d6ef9d527924ea28a5384af849d5a58eecd8