LPS-48099 Fix usages of QueryDefinition
LPS-48099 Regenerate