Merge t-qpr-2022-12

Change-Id: I8af1fba6e51e9a751d9af55828d23e4b12eb1e21