Syncs hydro_dev branch to groovy_dev branch

This is a Catkinized version