Hydro devel updated with latest changes from other branches

This pull-request has not been tested