Merge t-qpr-2022-12

Change-Id: I15b58bea82aae7f0d5e240f8640340ce49739572