Pooja/Melanie| #3739 | Handling month-year and year date format