Support valid/invalid ranges
Merge branch 'valid-date' into develop