Sync with TrinityCore/TrinityCore@6b42f99540dda13b622fe1653993e3b84709efc7