Merge t-qpr-2022-12

Change-Id: I9719c9a655e142bca74aac02210bfe156993642c