Draft: Resolve TMSS-2872 (June 17th, DO NOT MERGE YET!)
June 17th, DO NOT MERGE YET! See: https://support.astron.nl/jira/browse/TMSS-2872?focusedCommentId=70581&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-70581
Closes TMSS-2872
Edited by Jorrit Schaap