Merge t-qpr-2022-12

Change-Id: I74cd28cfa5a4179f39418988a47b4e3216884c95