Merge branch 'integration' into dev