Merge r-mpr-2022-08

Change-Id: I4c73b052ebfcbf28e2eccaad2cae17f12a67509c