Merge mpr-2021-11-05

Change-Id: Iff2b1fab4682503b7a244870615f2bae538f26b9