Merge mpr-2021-09-05

Change-Id: Ia9a0d2aab2320f82ba703cf60a85e804d3d67daf