Merge mpr-2021-11-05

Change-Id: Ib3c68072a42d7aca7d7fa711bd82f923f20bc6eb