Merge t-qpr-2022-12

Change-Id: Ic6c97fc10a74a3f462db9ded2ee1d3f6f60ecc1c