JBTM-1566 Initial work to support timed delivery