Convert #355297 to Flügger