1) Minor refactoring
2) "" timestamp value is processed as null
Merge remote-tracking branch 'origin/master'