Merge t-qpr-2022-12

Change-Id: I5c23adbe345b1b00bc88fcee4e229da860d2c5fb