Merge r-mpr-2022-01-05

Change-Id: Ieaf0181a9835e5361321c2bbd57d5b93a3b5be11