[SV-1791] - Singularity JIRA