Merge t-qpr-2022-12

Change-Id: I2e0188c4edb2467aac5e430f78f0e090d2784092