Merge mpr-2021-11-05

Change-Id: I50f47227c66b361921ba8373f7ede7ad86b94baf