Reply To: Performance issue fixing