Merge r-mpr-2022-06

Change-Id: Ib5a52f8e87d8a30d62bc923fbf6236ec14700762