Merge t-qpr-2022-12

Change-Id: Ic0654947b527546dc1e1b7aab86f38b1e007853a