Merge t-qpr-2022-12

Change-Id: If282f3c0dc7c907f6d444658931180031f1a0a59