Merge t-qpr-2022-12

Change-Id: I0e9a7dce555dbb2312ec4040a1b11adf390141a0