Merge t-qpr-2022-12

Change-Id: I392748f2ded8089a611be6b32d8182229405fbdf