Merge mpr-2021-11-05

Change-Id: I58d56ee7e9b082e49c15bcf088792f9293a783d3