Convert #624863 to Flügger