Sync with TrinityCore/TrinityCore@1d210bc490a6cc99c20f1be79eab6fe133e82870