Merge mpr-2021-11-05

Change-Id: I1943de36997d68b6fa716ba951e861fc3bad9019