Merge branch 'integration_2'