Merge branch 'strategies' into hydro-devel [ci skip]