Sync with TrinityCore/TrinityCore@42f5017261b5