Merge branch '534-non-implemented-functions-lead-to-infinite-loops-in-fluid-system' into 'master'

Resolve "Non-implemented functions lead to infinite loops in fluid system"

Closes #534

See merge request !1133