Convert #831739 to Flügger