Sync with TrinityCore/TrinityCore@267e95dfe6c85d3191dbc874c9198be68df64553