Merge r-mpr-2022-01-05

Change-Id: I120817469872fd4e74f997bbbf7abde107fc9838