Merge t-qpr-2022-12

Change-Id: I0e491b93273bdb7050816ad1e3bfa07648a080fc