Merge t-qpr-2022-12

Change-Id: I4b3238135fbd264c29aa64759f569dbdaabe14e9