back port from hydro to groovy