Merge branch 'groovy-devel' into hydro-devel