Merge changes from hydro-devel-fixed (Throttling)