Sync with TrinityCore/TrinityCore@e16caac