Merge r-mpr-2022-10

Change-Id: Id701676a3eed680dc949549ee34a00a80bdd0442