Add suggestions from wiki id 19795