Merge t-qpr-2022-12

Change-Id: I4416ee05e7fa192c5df2d184974f43577426b23b