Merge r-mpr-2022-01-05

Change-Id: Idbe4df349d1625b57e0c3404c21e785f380a8ef2