Sync with TrinityCore/TrinityCore@33be04ddcda8ab5b4ed77df2cc65cc55da1b151b