https://raidiam.atlassian.net/jira/software/c/projects/OICS/boards/90?modal=detail&selectedIssue=OICS-423
