Merge t-qpr-2022-12

Change-Id: I9045e0ecb8eeb2cea932d12b6f12991aeb492e34