Sync with TrinityCore/TrinityCore@0f049907d2c19ec12e08b065d7721f694479aa64