Merge t-qpr-2022-12

Change-Id: I845dcac043bdefe6a75e4fbe05fa0e04b43b484f