Merge t-qpr-2022-12

Change-Id: Ib7358eaf083a61bcf890695fa1360c1be870b9ed