Merge t-qpr-2022-12

Change-Id: Ia05ad755776b396a81af2716dbc241af00bb321a