integrated modifications from groovy_dev