Merge r-mpr-2022-01-05

Change-Id: I3f3448ce795739c466fe013f251ad298a18723b4