Merge t-qpr-2022-12

Change-Id: Iad52d5277b52dfc37cbec53bc3b3d1c1108a1aea