Merge mpr-2021-11-05

Change-Id: I85ca84398dcd87c73cfe95be7e78069113647963