Merge t-qpr-2022-12

Change-Id: I823cf5c58722b4b64d809ec7e0b3e2e18f68a710