Convert #629231 to Flügger