normalize created_at and updated_at to string if they cannot be converted to timestamp
Merge branch 'fix/1872' into develop