Sync with TrinityCore/TrinityCore@aa638d9bc74a53b29f9a7c1f07fa93d47075b2bc