Merge "Renamed "intelligence" to "content_capture""