Merge changes from marine-integrations, remove ion dependencies