Merge t-qpr-2022-12

Change-Id: Ide91ea634e03ca04c452bcb5163b7daf056ff1b4