Sync with TrinityCore/TrinityCore@3ef7a7299f022e0062caabf2e808b36e30f84ae0