Merge branch 'groovy_migration' into SampleReturn