Don't inflate null as DateTime('now')
Merge remote-tracking branch 'origin/master'