DSS-331 #time 17m Resolving issues related to date parsing