Merge s-mpr-2022-01-05

Change-Id: I026f717a7e2a62130c721595a192ea18250a3b39