Merge t-qpr-2022-12

Change-Id: I6fb84d8dd1979c7d19060f394f0193332b4adf9a