Convert #628315 to Flügger