Sync with TrinityCore/cd24526aac