Merge Groovy/Hydro branches