Sync with TrinityCore/ff3524f