Created by https://servicedesk.sun.ac.za/jira/browse/ISM-61152