Merge r-mpr-2022-01-05

Change-Id: I72dcce4ff71948a6012088c4ad9831b6269aeda9