Merge t-qpr-2022-12

Change-Id: Ia06431dc4055f8a46f93a2f3b34d1699a8f2890e