Merge t-qpr-2022-12

Change-Id: Ia080f8f61358ec579a948adcb05e3f40f5bd4caa