Merge s-mpr-2021-12-05

Change-Id: I6ba1caf9311b57205231789f3ce365ec44c14f28