Merge r-mpr-2022-06

Change-Id: I766812a39355c75a316327b169f09099f8eab4e5