Pulling in changes from Hydro(release) branch.