Sync with TrinityCore/TrinityCore@f767aef12eaf2e55deed89590eb9e8a39b0d1653