Sync with TrinityCore/TrinityCore@c671b8e04bc8