Sync with TrinityCore/TrinityCore@35b14f15e171