Merge r-mpr-2022-01-05

Change-Id: Ide1e03304c5c8422ca92364102535cf3a8b705b8