[SV-1979] - Singularity JIRA