Merge branch 'integration-next' into integration