Sync with TrinityCore/6889f7cde6