Merge t-qpr-2022-12

Change-Id: Icdd9789c72372094b03f64a78713bd9ef858505f