Sync with TrinityCore/TrinityCore@e3e342b0f79cfb9e88fbb9aba124c6f8c611eb1b