end date may not be null
Merge remote-tracking branch 'origin/master' into origin_master