Merge mpr-2021-11-05

Change-Id: I65959222860080e181bf1462feac367b2fd41c07