Merge mpr-2021-11-05

Change-Id: I8a05a1ffc9e84adf17348949f97a326eab0238fc