Convert #109339 to Flügger