Improve free-flow example
Closes #855 (closed)
See merge request !1976 (merged)
(cherry picked from commit 2c74b446)