Singularity-1274

Singularity-1274