Fix doc
Synchronize packages with hydro-devel branch