Merge t-qpr-2022-12

Change-Id: I43126dcade8ac56acdffd892593b5c0387b9d24f