Merge branch 'hotfix/0.2.1' into develop
Hydro: use same hydro, not calculated one.
Merge branch 'release/0.2.2'