Merge t-qpr-2022-12

Change-Id: I5b86000d4faa02c19a34296d7b2e71c1d042f9e6