Convert #831585 to Flügger