Merge t-qpr-2022-12

Change-Id: I06c8b5119699ef1a57a30102f6987e9071bd4393