Sync with TrinityCore/TrinityCore@3545d60b7d70e7097e1aeda8b7dd6af19a6c0ab8