Merge r-mpr-2022-01-05

Change-Id: Iec86002a71506efbebac550f2bd4babd439fd995
tree: b93d65cb834973bd40ce5c6c4196ea33485f8dba
  1. iorap/