Merge t-qpr-2022-12

Change-Id: Ief77a6a3f8575a25b4e0c249d39614d9e5069af4