Applied fix from adnconfluence-dev@adnovum.ch (https://ecosystem.atlassian.net/browse/CPSP-68?focusedCommentId=123125&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-123125)
Applied fix from adnconfluence-dev@adnovum.ch (https://ecosystem.atlassian.net/browse/CPSP-68?focusedCommentId=123125&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-123125)