Sync with TrinityCore/TrinityCore@995ace898867d1e399a1d202a9666e5bfcbd1912