making changes as per Ravi's fix in Dev3 , Dev Task : CSH-1728