Sync with TrinityCore/TrinityCore@722a5ba7ee0f66a33704916fff57d18842de2f8f