Sync with TrinityCore/TrinityCore@479afe612318b9fa6ea0a208881288f6e82188c6