Merge r-mpr-2022-06

Change-Id: Icf5cc99b8348e266e403de119dd5ba620f23d5ae