Sync with TrinityCore/TrinityCore@da91ae1f225b711c916b180675886b31b2d2ebf4