Sync with TrinityCore/TrinityCore@ab85c1546fcf0d931873090ea570299303545299