Merge t-qpr-2022-12

Change-Id: I80eff29b4cfec80beafcf468f723ab478bc07a49