Merge t-qpr-2022-12

Change-Id: I0669a2e433b0fdd2f6484c3037c2e9589aa112a9