Convert #623461 to Flügger