Merge mpr-2021-10-05

Change-Id: I30723d0235dfff01bf7419b0bcb83be8deaea89e