Sync with TrinityCore/TrinityCore@f185077fbf965c1447a46896b1483950909d431d