First Merge the current state of groovy_dev to fuerte_dev for a better comparison with the further pull request