Merge mpr-2021-11-05

Change-Id: If6e48eaafcad2a79fa8d24a794050ef012ea3153