Merge t-qpr-2022-12

Change-Id: I51805246500ff13aca0ba3e8ff212259a5ffaea1