Sync with TrinityCore/TrinityCore@878ffbc22a61566f6f450efc8b9f4f81d5486cdf