Merge t-qpr-2022-12

Change-Id: I0b9a0ebaf4d52dcf113915f5aa00897bd8245bfd