Merging latest changed from groovy to hydro devel branch