Sync with TrinityCore/TrinityCore@b347df111f7f65096281b1dc46ce28f849ad21b9