Merge t-qpr-2022-12

Change-Id: I76615234410e2c277e057ad113c563e855aa2288