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