Merge t-qpr-2022-12

Change-Id: Ic0b5ff20e715d060c3bbf999fa81b0a0b7b841aa