Merging changes from groovy branch.