Merge with 'integration-other-apps'