Convert #316947 to Flügger