Merge t-qpr-2022-12

Change-Id: I67f52b77b872202109a0849ba1f62108a3a1cf87