set null for  Date if not defined
Merge remote-tracking branch 'origin/master'