Merge in content from mios-datetime-handling