Sync with TrinityCore/TrinityCore@9bac986f35067941552b7dec8da81eac127d2f66