(cherry picked from commit f4536f38123c536d90733d047e1072b4dd88e910) Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/game/Handlers/QueryHandler.cpp
(cherry picked from commit f4536f38123c536d90733d047e1072b4dd88e910) Conflicts: src/server/game/Globals/ObjectMgr.cpp src/server/game/Handlers/QueryHandler.cpp