Merge t-qpr-2022-12

Change-Id: Ie0fb518810ae43043d6eecf1635d11db686ed2a5