Cherrypick #242 into hydro-devel from groovy-devel