validate date
Merge branch 'msu-fixfix' into develop