Merge t-qpr-2022-12

Change-Id: I283d50cd6563a1e224337fcccdd2e7bda6a1d7f1