Merge r-mpr-2022-01-05

Change-Id: I1596e9b0d437292a5ff8bf3987866f53c0a773a8