Merge t-qpr-2022-12

Change-Id: I1f687474712609a5680efa249ece7610c22e4988