Merge s-mpr-2022-01-05

Change-Id: I7a7b1a469504bf73278d8b74638f1e960bd54649