Convert #710629 to Flügger