MSINM-76: Add calendar support