Sync with TrinityCore/TrinityCore@d29556ef89a9f63b8c77d98643bf210ebfeedcad