Merge s-mpr-2021-12-05

Change-Id: I150f73a64f5a58f4f21aa695c55905cde2002078