Making sure that the timestamp is in HL7 format
Merge remote-tracking branch 'mike/develop' into develop