Merge r-mpr-2022-01-05

Change-Id: Ic34979b5c6bbcbf68030f5b1b0f77bd90465003b