Merge mpr-2021-11-05

Change-Id: Idecb426323285532c211cf56469f0d03b3d3f94c