Groovy bug fixes
Groovy big fix
Merge
Fix Script url ref