Merge s-mpr-2022-01-05

Change-Id: I1786e7f4ffc6d19cd89febafe066b8e9f433290e