Merge branch 'mock_infrastructure' into hydro-devel