Merge t-qpr-2022-12

Change-Id: I00a116c6bd78a2a0fab5abf14013429bf6ab1acf