(cherry picked from commit 3498d9579dd8f0ac2ee6cc965cab6c37e0caf312) Conflicts: src/server/game/Globals/ObjectMgr.cpp