Merge s-mpr-2021-12-05

Change-Id: I017d9e2a4811008e5038000ce7c3b4e2fddc5cd8