Issue-331
Issue-331
Issue-331
MIFOSX-331: merge Khusas work around calendars that was revied by Ashok.2