Merge t-qpr-2022-12

Change-Id: Icde3ad943e499e1bfa0eafb85e9c1406fab45ae5