Merge t-qpr-2022-12

Change-Id: Icdcb0dab0428d34231c6437ce33564e2bf4b202f