Convert #831845 to Flügger