One more fix for the same bug.
Merge branch 'dev' into hydro-add-melt