Merge t-qpr-2022-12

Change-Id: I0fa4d7ff5a1c6d8078376b9470cc7cb75c87c187