Sync with TrinityCore/TrinityCore@c26dec8dbba6ae6480018c571513f75e0b151a65