CONTRIB-4704 Add 24hr time option