Sync hydro-devel with indigo branch.