Merge t-qpr-2022-12

Change-Id: Ia8259918dbcec88409faec2623cccdadaacebf54