Merge t-qpr-2022-12

Change-Id: Ieb758b41bde0ed6f1e06c23b07bb0c863e3ded1d