Hydro devel updated with latest changes from master branch

Note: previous pull request has been forcely reverted