Sync with TrinityCore/TrinityCore@a73cee97e298c251c71774f3507997df40b5f957