* Also renames the header to it's correct name QueryCallback (cherry picked from commit d4d199d765)
d4d199d765