Merge r-mpr-2022-02-05

Change-Id: I166eba252d045acdaa506272612d44a7b0936f49