Issue #2893742 by nkoporec, bapi_22: Removed deprecated method/Class QueryFactory calls from code base