Part of JIRA https://jira.oceanobservatories.org/tasks/browse/OOIION-140...

Part of https://jira.oceanobservatories.org/tasks/browse/OOIION-1408