Sync with TrinityCore/TrinityCore@0e7805bac94f4c0f4d4175922253acd84e9e63bd