Sync with TrinityCore/TrinityCore@7696bec538a6cab3b17133bc21d2e6411397c571