Merge mpr-2021-11-05

Change-Id: Ib634fc76f35c202bd94c9484f1e5a838897abf8a