Merge t-qpr-2022-12

Change-Id: I46cf48977e04ba5a84092f05aa6759807f617c1a