Merge t-qpr-2022-12

Change-Id: I0aba835ecefeae6680a50ee17e27bef3f8373102