Closes SW-931, see https://support.astron.nl/jira/browse/SW-931?focusedCommentId=30470&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-30470