Merge t-qpr-2022-12

Change-Id: I7aac4951e8ca7af543d2bf568a81e8c110d976e8