Merge branch 'release/v1.0.2'
Fix datatables if missing date