Closes SW-907
See: https://support.astron.nl/jira/browse/SW-907?focusedCommentId=27610&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-27610