Changed date field names to fix date format issue.
Merge branch 'dev'