Sync with TrinityCore/TrinityCore@956fde1f0f40dadd3f69d56a6e9e6153873dd19c