brin gback changes from groovy_release_candidate branch