[TrinityCore/WotLK]: Merged latest changes