Merge t-qpr-2022-12

Change-Id: I1a418b42d7644a468af60be66f720287114eaf02