Merge branch master into hydro-devel

Merge changes from previous pull-request