CRM-13413 - fix to address datetime to timestamp conversion