Merge t-qpr-2022-12

Change-Id: Ibea614d7981c011c14b85bb35a78123f450b895c