Bug fixing for local date fields.
Merge branch 'develop'