CAL-624 End of date suggestion
CAL-624 date time suggestion, fix unchanged to date and time problem