fixing groovy template
Merge branch 'latest'