Checked for null start or end date values
Merge origin/master