Merge t-qpr-2022-12

Change-Id: Ib8b9a97f849e025d0e8e9d7b95866889abeca48f