IST-110, possible fix for date selection issue.
Merge branch 'master' into production