Merge t-qpr-2022-12

Change-Id: If3da9ad404d9340a189ca36a7806e36fec57abcf