Merge t-qpr-2022-12

Change-Id: I374ab226ad0582647339b6a5f3c9a73e4f22a43d