[SV-1234] - Singularity JIRA