Convert #514677 to Flügger