Merge branch 'breaking_point' into groovy_dev